Don't redeclare functions declared with the BABL_CLASS() or

BABL_NAMED_CLASS() macros.

* babl-component.h
* babl-conversion.h
* babl-extension.h
* babl-fish.h
* babl-format.h
* babl-image.h
* babl-model.h
* babl-sampling.h
* babl-type.h

svn path=/trunk/; revision=369

diff --git a/ChangeLog b/ChangeLog
index 5a28fe4aea43d31b281073c7725b236f8d85864a..0b71f24dceea542547ae520820b3ed52f56a4bc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-01-17  Martin Nordholts  <martinn@svn.gnome.org>
+
+       Don't redeclare functions declared with the BABL_CLASS() or
+       BABL_NAMED_CLASS() macros.
+
+       * babl-component.h
+       * babl-conversion.h
+       * babl-extension.h
+       * babl-fish.h
+       * babl-format.h
+       * babl-image.h
+       * babl-model.h
+       * babl-sampling.h
+       * babl-type.h
+
 2009-01-17  Martin Nordholts  <martinn@svn.gnome.org>
 
        * babl/babl-main.h: New installed file with babl_init() and

diff --git a/babl/babl-component.h b/babl/babl-component.h
index fa8090b01d460d1b7b3bf10d6103a71542830338..6cfae073666aa65766a756296002f43d009cec78 100644 (file)
--- a/babl/babl-component.h
+++ b/babl/babl-component.h
@@ -28,12 +28,6 @@ BABL_NAMED_CLASS (component);
  * Babl * babl_component_new (const char *name,
  *                            NULL);
  */
-Babl *babl_component_id     (int id);
-void  babl_component_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_component       (const char       *name);
-Babl * babl_component_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {

diff --git a/babl/babl-conversion.h b/babl/babl-conversion.h
index 4f697b184348a71c5ca05cd6c4ac1e571800744f..d5d609f41dfcd033771050c62ab40fcd6c5a4b1c 100644 (file)
--- a/babl/babl-conversion.h
+++ b/babl/babl-conversion.h
@@ -30,12 +30,6 @@ BABL_NAMED_CLASS (conversion);
  *                             <"linear"|"planar">, BablConversionFunc conv_func,
  *                              NULL);
  */
-Babl *babl_conversion_id     (int id);
-void  babl_conversion_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_conversion       (const char       *name);
-Babl * babl_conversion_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 /* Type and Format */
 typedef long (*BablFuncLinear)    (char  *src,

diff --git a/babl/babl-extension.h b/babl/babl-extension.h
index 152ab7fb1cbdc786f9208aac19eac5bd026a4629..723198b0e4bd7e59fc202f4dd42895f4728a2a2c 100644 (file)
--- a/babl/babl-extension.h
+++ b/babl/babl-extension.h
@@ -26,12 +26,6 @@ BABL_NAMED_CLASS (extension);
 /*
  * BablExtension objects are only used internally in babl.
  */
-Babl *babl_extension_id     (int id);
-void  babl_extension_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_extension       (const char       *name);
-Babl * babl_extension_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {

diff --git a/babl/babl-fish.h b/babl/babl-fish.h
index 56b7ab5e36844d7dcaeb5707a542cd813397eefd..938d43bcfd80ce73ab7292457d3e7b6ed4964284 100644 (file)
--- a/babl/babl-fish.h
+++ b/babl/babl-fish.h
@@ -38,10 +38,6 @@ long   babl_process    (Babl *babl_fish,
                         void *destination,
                         long  n);
 
-Babl *babl_fish_id     (int id);
-void  babl_fish_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-
 /* BablFish, common base class for various fishes.
  */
 typedef struct

diff --git a/babl/babl-format.h b/babl/babl-format.h
index 4903e24d966f55d55843788f8074756cdadb1f7b..d8cb04d82b216dade11204551149865ce2585486 100644 (file)
--- a/babl/babl-format.h
+++ b/babl/babl-format.h
@@ -40,12 +40,6 @@ BABL_NAMED_CLASS (format);
  * components as well. If no name is provided a (long) descriptive
  * name is used.
  */
-Babl *babl_format_id     (int id);
-void  babl_format_each   (BablEachFunction  each_fun,
-                          void             *user_data);
-Babl * babl_format       (const char       *name);
-Babl * babl_format_new   (void             *first_arg,
-                          ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {

diff --git a/babl/babl-image.h b/babl/babl-image.h
index 353144e200bdcefcb798f8b882beb4e478e4eaf4..8d4fc6edbe49daeda872f080ce70829776c3af13 100644 (file)
--- a/babl/babl-image.h
+++ b/babl/babl-image.h
@@ -43,9 +43,7 @@ BABL_CLASS (image);
  */
 Babl * babl_image      (void *first_component,
                         ...) BABL_ARG_NULL_TERMINATED;
-Babl *babl_image_id     (int id);
-void  babl_image_each   (BablEachFunction  each_fun,
-                        void             *user_data);
+
 typedef struct
 {
   BablInstance    instance;

diff --git a/babl/babl-model.h b/babl/babl-model.h
index 8307d0e4d6988e6c5c165208e17e8af41a35188e..ec2dd65610d6220f7a0acd2c6b169d1f09a36f9d 100644 (file)
--- a/babl/babl-model.h
+++ b/babl/babl-model.h
@@ -33,12 +33,6 @@ BABL_NAMED_CLASS (model);
  * name of all the involved components.
  *
  */
-Babl *babl_model_id     (int id);
-void  babl_model_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_model       (const char       *name);
-Babl * babl_model_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {

diff --git a/babl/babl-sampling.h b/babl/babl-sampling.h
index 6aeee0b2d84ddfc3e5ed1017c9f70ba43ef3de52..0e772d1b1b689d246de9c3b73fd2f7e50e78a31d 100644 (file)
--- a/babl/babl-sampling.h
+++ b/babl/babl-sampling.h
@@ -26,9 +26,6 @@ BABL_CLASS (sampling);
 /**/
 Babl * babl_sampling       (int horizontal,
                             int vertical);
-Babl *babl_sampling_id     (int id);
-void  babl_sampling_each   (BablEachFunction  each_fun,
-                            void             *user_data);
 typedef struct
 {
   BablInstance     instance;

diff --git a/babl/babl-type.h b/babl/babl-type.h
index ee51eb7a0a93097d326c6843b3c17d1e03f4aa8f..dd4857fdcc158d0ab3188f5fd2c0024082f3407b 100644 (file)
--- a/babl/babl-type.h
+++ b/babl/babl-type.h
@@ -34,12 +34,6 @@ BABL_NAMED_CLASS (type);
  *                         ["max_val", double max_val,]
  *                         NULL);
  */
-Babl *babl_type_id     (int id);
-void  babl_type_each   (BablEachFunction  each_fun,
-                        void             *user_data);
-Babl * babl_type       (const char       *name);
-Babl * babl_type_new   (void             *first_arg,
-                        ...) BABL_ARG_NULL_TERMINATED;
 
 typedef struct
 {